From c5a8bdb1df091ec8a440f75b4b45a7a6f8128092 Mon Sep 17 00:00:00 2001 From: "adsharma@xuni-t01.sc.intel.com" Date: Tue, 2 Aug 2005 16:25:11 -0800 Subject: [PATCH] Move copy+patched files to linux-xen directory. Signed-off-by: Arun Sharma --- xen/arch/ia64/Makefile | 2 +- xen/arch/ia64/Rules.mk | 11 ++++++++--- xen/arch/ia64/{ => linux-xen}/efi.c | 0 xen/arch/ia64/{ => linux-xen}/entry.S | 0 xen/arch/ia64/{ => linux-xen}/entry.h | 0 xen/arch/ia64/{ => linux-xen}/head.S | 0 xen/arch/ia64/{ => linux-xen}/irq_ia64.c | 0 xen/arch/ia64/{ => linux-xen}/mm_contig.c | 0 xen/arch/ia64/{ => linux-xen}/pal.S | 0 xen/arch/ia64/{ => linux-xen}/setup.c | 0 xen/arch/ia64/{ => linux-xen}/time.c | 0 xen/arch/ia64/{ => linux-xen}/tlb.c | 0 xen/arch/ia64/{ => linux-xen}/unaligned.c | 0 xen/include/asm-ia64/{ => linux-xen/asm}/gcc_intrin.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/hpsim_ssc.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/ia64regs.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/io.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/kregs.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/mca_asm.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/page.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/pal.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/pgalloc.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/processor.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/ptrace.h | 0 .../asm-ia64/{linux => linux-xen}/asm/sn/sn_sal.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/system.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/types.h | 0 xen/include/asm-ia64/{ => linux-xen/asm}/uaccess.h | 0 xen/include/asm-ia64/{ => linux-xen}/linux/cpumask.h | 0 xen/include/asm-ia64/{ => linux-xen}/linux/hardirq.h | 0 .../asm-ia64/{ => linux-xen}/linux/interrupt.h | 0 31 files changed, 9 insertions(+), 4 deletions(-) rename xen/arch/ia64/{ => linux-xen}/efi.c (100%) rename xen/arch/ia64/{ => linux-xen}/entry.S (100%) rename xen/arch/ia64/{ => linux-xen}/entry.h (100%) rename xen/arch/ia64/{ => linux-xen}/head.S (100%) rename xen/arch/ia64/{ => linux-xen}/irq_ia64.c (100%) rename xen/arch/ia64/{ => linux-xen}/mm_contig.c (100%) rename xen/arch/ia64/{ => linux-xen}/pal.S (100%) rename xen/arch/ia64/{ => linux-xen}/setup.c (100%) rename xen/arch/ia64/{ => linux-xen}/time.c (100%) rename xen/arch/ia64/{ => linux-xen}/tlb.c (100%) rename xen/arch/ia64/{ => linux-xen}/unaligned.c (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/gcc_intrin.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/hpsim_ssc.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/ia64regs.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/io.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/kregs.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/mca_asm.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/page.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/pal.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/pgalloc.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/processor.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/ptrace.h (100%) rename xen/include/asm-ia64/{linux => linux-xen}/asm/sn/sn_sal.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/system.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/types.h (100%) rename xen/include/asm-ia64/{ => linux-xen/asm}/uaccess.h (100%) rename xen/include/asm-ia64/{ => linux-xen}/linux/cpumask.h (100%) rename xen/include/asm-ia64/{ => linux-xen}/linux/hardirq.h (100%) rename xen/include/asm-ia64/{ => linux-xen}/linux/interrupt.h (100%) diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile index 755041a3a6..7c397a328b 100644 --- a/xen/arch/ia64/Makefile +++ b/xen/arch/ia64/Makefile @@ -1,6 +1,6 @@ include $(BASEDIR)/Rules.mk -VPATH = linux +VPATH = linux linux-xen # libs-y += arch/ia64/lib/lib.a diff --git a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk index 59ac0cfa2d..69a78471b2 100644 --- a/xen/arch/ia64/Rules.mk +++ b/xen/arch/ia64/Rules.mk @@ -6,8 +6,11 @@ ifneq ($(COMPILE_ARCH),$(TARGET_ARCH)) CROSS_COMPILE ?= /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux- endif AFLAGS += -D__ASSEMBLY__ -CPPFLAGS += -I$(BASEDIR)/include -I$(BASEDIR)/include/asm-ia64 \ - -I$(BASEDIR)/include/asm-ia64/linux -I$(BASEDIR)/arch/ia64/linux +CPPFLAGS += -I$(BASEDIR)/include -I$(BASEDIR)/include/asm-ia64 \ + -I$(BASEDIR)/include/asm-ia64/linux \ + -I$(BASEDIR)/include/asm-ia64/linux-xen \ + -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen + CFLAGS := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing #CFLAGS += -O3 # -O3 over-inlines making debugging tough! CFLAGS += -O2 # but no optimization causes compile errors! @@ -15,7 +18,9 @@ CFLAGS += -O2 # but no optimization causes compile errors! CFLAGS += -iwithprefix include -Wall CFLAGS += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__ CFLAGS += -I$(BASEDIR)/include/asm-ia64 -I$(BASEDIR)/include/asm-ia64/linux \ - -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64 + -I$(BASEDIR)/include/asm-ia64/linux \ + -I$(BASEDIR)/include/asm-ia64/linux-xen \ + -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen CFLAGS += -Wno-pointer-arith -Wredundant-decls CFLAGS += -DIA64 -DXEN -DLINUX_2_6 CFLAGS += -ffixed-r13 -mfixed-range=f12-f15,f32-f127 diff --git a/xen/arch/ia64/efi.c b/xen/arch/ia64/linux-xen/efi.c similarity index 100% rename from xen/arch/ia64/efi.c rename to xen/arch/ia64/linux-xen/efi.c diff --git a/xen/arch/ia64/entry.S b/xen/arch/ia64/linux-xen/entry.S similarity index 100% rename from xen/arch/ia64/entry.S rename to xen/arch/ia64/linux-xen/entry.S diff --git a/xen/arch/ia64/entry.h b/xen/arch/ia64/linux-xen/entry.h similarity index 100% rename from xen/arch/ia64/entry.h rename to xen/arch/ia64/linux-xen/entry.h diff --git a/xen/arch/ia64/head.S b/xen/arch/ia64/linux-xen/head.S similarity index 100% rename from xen/arch/ia64/head.S rename to xen/arch/ia64/linux-xen/head.S diff --git a/xen/arch/ia64/irq_ia64.c b/xen/arch/ia64/linux-xen/irq_ia64.c similarity index 100% rename from xen/arch/ia64/irq_ia64.c rename to xen/arch/ia64/linux-xen/irq_ia64.c diff --git a/xen/arch/ia64/mm_contig.c b/xen/arch/ia64/linux-xen/mm_contig.c similarity index 100% rename from xen/arch/ia64/mm_contig.c rename to xen/arch/ia64/linux-xen/mm_contig.c diff --git a/xen/arch/ia64/pal.S b/xen/arch/ia64/linux-xen/pal.S similarity index 100% rename from xen/arch/ia64/pal.S rename to xen/arch/ia64/linux-xen/pal.S diff --git a/xen/arch/ia64/setup.c b/xen/arch/ia64/linux-xen/setup.c similarity index 100% rename from xen/arch/ia64/setup.c rename to xen/arch/ia64/linux-xen/setup.c diff --git a/xen/arch/ia64/time.c b/xen/arch/ia64/linux-xen/time.c similarity index 100% rename from xen/arch/ia64/time.c rename to xen/arch/ia64/linux-xen/time.c diff --git a/xen/arch/ia64/tlb.c b/xen/arch/ia64/linux-xen/tlb.c similarity index 100% rename from xen/arch/ia64/tlb.c rename to xen/arch/ia64/linux-xen/tlb.c diff --git a/xen/arch/ia64/unaligned.c b/xen/arch/ia64/linux-xen/unaligned.c similarity index 100% rename from xen/arch/ia64/unaligned.c rename to xen/arch/ia64/linux-xen/unaligned.c diff --git a/xen/include/asm-ia64/gcc_intrin.h b/xen/include/asm-ia64/linux-xen/asm/gcc_intrin.h similarity index 100% rename from xen/include/asm-ia64/gcc_intrin.h rename to xen/include/asm-ia64/linux-xen/asm/gcc_intrin.h diff --git a/xen/include/asm-ia64/hpsim_ssc.h b/xen/include/asm-ia64/linux-xen/asm/hpsim_ssc.h similarity index 100% rename from xen/include/asm-ia64/hpsim_ssc.h rename to xen/include/asm-ia64/linux-xen/asm/hpsim_ssc.h diff --git a/xen/include/asm-ia64/ia64regs.h b/xen/include/asm-ia64/linux-xen/asm/ia64regs.h similarity index 100% rename from xen/include/asm-ia64/ia64regs.h rename to xen/include/asm-ia64/linux-xen/asm/ia64regs.h diff --git a/xen/include/asm-ia64/io.h b/xen/include/asm-ia64/linux-xen/asm/io.h similarity index 100% rename from xen/include/asm-ia64/io.h rename to xen/include/asm-ia64/linux-xen/asm/io.h diff --git a/xen/include/asm-ia64/kregs.h b/xen/include/asm-ia64/linux-xen/asm/kregs.h similarity index 100% rename from xen/include/asm-ia64/kregs.h rename to xen/include/asm-ia64/linux-xen/asm/kregs.h diff --git a/xen/include/asm-ia64/mca_asm.h b/xen/include/asm-ia64/linux-xen/asm/mca_asm.h similarity index 100% rename from xen/include/asm-ia64/mca_asm.h rename to xen/include/asm-ia64/linux-xen/asm/mca_asm.h diff --git a/xen/include/asm-ia64/page.h b/xen/include/asm-ia64/linux-xen/asm/page.h similarity index 100% rename from xen/include/asm-ia64/page.h rename to xen/include/asm-ia64/linux-xen/asm/page.h diff --git a/xen/include/asm-ia64/pal.h b/xen/include/asm-ia64/linux-xen/asm/pal.h similarity index 100% rename from xen/include/asm-ia64/pal.h rename to xen/include/asm-ia64/linux-xen/asm/pal.h diff --git a/xen/include/asm-ia64/pgalloc.h b/xen/include/asm-ia64/linux-xen/asm/pgalloc.h similarity index 100% rename from xen/include/asm-ia64/pgalloc.h rename to xen/include/asm-ia64/linux-xen/asm/pgalloc.h diff --git a/xen/include/asm-ia64/processor.h b/xen/include/asm-ia64/linux-xen/asm/processor.h similarity index 100% rename from xen/include/asm-ia64/processor.h rename to xen/include/asm-ia64/linux-xen/asm/processor.h diff --git a/xen/include/asm-ia64/ptrace.h b/xen/include/asm-ia64/linux-xen/asm/ptrace.h similarity index 100% rename from xen/include/asm-ia64/ptrace.h rename to xen/include/asm-ia64/linux-xen/asm/ptrace.h diff --git a/xen/include/asm-ia64/linux/asm/sn/sn_sal.h b/xen/include/asm-ia64/linux-xen/asm/sn/sn_sal.h similarity index 100% rename from xen/include/asm-ia64/linux/asm/sn/sn_sal.h rename to xen/include/asm-ia64/linux-xen/asm/sn/sn_sal.h diff --git a/xen/include/asm-ia64/system.h b/xen/include/asm-ia64/linux-xen/asm/system.h similarity index 100% rename from xen/include/asm-ia64/system.h rename to xen/include/asm-ia64/linux-xen/asm/system.h diff --git a/xen/include/asm-ia64/types.h b/xen/include/asm-ia64/linux-xen/asm/types.h similarity index 100% rename from xen/include/asm-ia64/types.h rename to xen/include/asm-ia64/linux-xen/asm/types.h diff --git a/xen/include/asm-ia64/uaccess.h b/xen/include/asm-ia64/linux-xen/asm/uaccess.h similarity index 100% rename from xen/include/asm-ia64/uaccess.h rename to xen/include/asm-ia64/linux-xen/asm/uaccess.h diff --git a/xen/include/asm-ia64/linux/cpumask.h b/xen/include/asm-ia64/linux-xen/linux/cpumask.h similarity index 100% rename from xen/include/asm-ia64/linux/cpumask.h rename to xen/include/asm-ia64/linux-xen/linux/cpumask.h diff --git a/xen/include/asm-ia64/linux/hardirq.h b/xen/include/asm-ia64/linux-xen/linux/hardirq.h similarity index 100% rename from xen/include/asm-ia64/linux/hardirq.h rename to xen/include/asm-ia64/linux-xen/linux/hardirq.h diff --git a/xen/include/asm-ia64/linux/interrupt.h b/xen/include/asm-ia64/linux-xen/linux/interrupt.h similarity index 100% rename from xen/include/asm-ia64/linux/interrupt.h rename to xen/include/asm-ia64/linux-xen/linux/interrupt.h -- 2.30.2